From 850d0e70becaa0064c31d512da59d1e73778dea3 Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu, 30 May 2013 16:07:31 +0800
Subject: [PATCH] GDK-Win32: Avoid Redefinition of _GDK_EXTERN

Include config.h first so that _GDK_EXTERN may be defined once
and only once during the build, so that we do not get warnings/
errors for macro redefinition.

https://bugzilla.gnome.org/show_bug.cgi?id=701251
---
 gdk/win32/gdkkeys-win32.c      | 4 ++--
 gdk/win32/gdktestutils-win32.c | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gdk/win32/gdkkeys-win32.c b/gdk/win32/gdkkeys-win32.c
index 97034899a5..48590f9532 100644
--- a/gdk/win32/gdkkeys-win32.c
+++ b/gdk/win32/gdkkeys-win32.c
@@ -21,6 +21,8 @@
  * files for a list of changes.  These files are distributed with
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
+#include "config.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -36,8 +38,6 @@
 #include "gdkkeysprivate.h"
 #include "gdkwin32keys.h"
 
-#include "config.h"
-
 struct _GdkWin32KeymapClass
 {
   GdkKeymapClass parent_class;
diff --git a/gdk/win32/gdktestutils-win32.c b/gdk/win32/gdktestutils-win32.c
index a4a643f30d..e1e574a36a 100644
--- a/gdk/win32/gdktestutils-win32.c
+++ b/gdk/win32/gdktestutils-win32.c
@@ -15,6 +15,8 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
+#include "config.h"
+
 #include <gdk/gdktestutils.h>
 #include <gdk/gdkkeysyms.h>
 #include <win32/gdkwin32.h>
-- 
2.30.2